ALSA: usb-audio: Don't avoid stopping the stream at disconnection

commit 257d2d7e9e798305d65825cb82b0a7d1c0511e89 upstream

In the later patch, we're going to issue the PCM sync_stop calls at
disconnection.  But currently the USB-audio driver can't handle it
because it has a check of shutdown flag for stopping the URBs.  This
is basically superfluous (the stopping URBs are safe at disconnection
state), so let's drop the check.

Fixes: dc5eafe7787c ("ALSA: usb-audio: Support PCM sync_stop")
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20210206203052.15606-4-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
[sudip: adjust context]
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Gbp-Pq: Topic bugfix/all
Gbp-Pq: Name alsa-usb-audio-don-t-avoid-stopping-the-stream-at-disconnection.patch

diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index e2f9ce2f5b8b6ab8770a7404ba0e1d5079b90079..8527267725bb718280c4252a5094ed93b2716ecf 100644 (file)
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -576,9 +576,6 @@ static int deactivate_urbs(struct snd_usb_endpoint *ep, bool force)
 {
        unsigned int i;
 
-       if (!force && atomic_read(&ep->chip->shutdown)) /* to be sure... */
-               return -EBADFD;
-
        clear_bit(EP_FLAG_RUNNING, &ep->flags);
 
        INIT_LIST_HEAD(&ep->ready_playback_urbs);

diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 1b08f52ef86f6bc0e77ece939fec5f9dffb9ae25..f4494d05491729759b230aa981698feaef771648 100644 (file)
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -280,10 +280,7 @@ static int snd_usb_pcm_sync_stop(struct snd_pcm_substream *substream)
 {
        struct snd_usb_substream *subs = substream->runtime->private_data;
 
-       if (!snd_usb_lock_shutdown(subs->stream->chip)) {
-               sync_pending_stops(subs);
-               snd_usb_unlock_shutdown(subs->stream->chip);
-       }
+       sync_pending_stops(subs);
        return 0;
 }